From: Paul Eggert Date: Sun, 14 Aug 2011 06:04:44 +0000 (-0700) Subject: * src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~56 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=72f838d47543177aaa33e5ac482c8005913cc633;p=emacs.git * src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch. --- diff --git a/src/xdisp.c b/src/xdisp.c index 6173ef4ce74..a3bdcbdf4c6 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3166,8 +3166,6 @@ compute_display_string_pos (struct text_pos *position, *disp_prop_p = 1; - *disp_prop_p = 1; - if (charpos >= eob /* We don't support display properties whose values are strings that have display string properties. */